From 940e39c97f77cccd763a21e1106daa163931fb7a Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 7 Sep 2005 14:19:05 +0000 Subject: [PATCH] Remove python virq code. Signed-off-by: Christian Limpach --- tools/python/xen/xend/server/SrvDaemon.py | 4 --- tools/python/xen/xend/server/channel.py | 30 +---------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index 0a8060fb47..ef25687477 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -316,10 +316,6 @@ class Daemon: self.channelF = channel.channelFactory() def listenChannels(self): - def virqReceived(virq): - eserver.inject('xend.virq', virq) - - self.channelF.setVirqHandler(virqReceived) self.channelF.start() def exit(self, rc=0): diff --git a/tools/python/xen/xend/server/channel.py b/tools/python/xen/xend/server/channel.py index f0485b789b..6d0e795a5f 100755 --- a/tools/python/xen/xend/server/channel.py +++ b/tools/python/xen/xend/server/channel.py @@ -145,22 +145,10 @@ class ChannelFactory: notifier = None - """Map of ports to the virq they signal.""" - virqPorts = None - def __init__(self): """Constructor - do not use. Use the channelFactory function.""" self.channels = {} - self.virqPorts = {} self.notifier = xu.notifier() - # Register interest in virqs. - self.bind_virq(xen.lowlevel.xc.VIRQ_DOM_EXC) - self.virqHandler = None - - def bind_virq(self, virq): - port = self.notifier.bind_virq(virq) - self.virqPorts[port] = virq - log.info("Virq %s on port %s", virq, port) def start(self): """Fork a thread to read messages. @@ -184,11 +172,7 @@ class ChannelFactory: if self.thread == None: return port = self.notifier.read() if port: - virq = self.virqPorts.get(port) - if virq is not None: - self.virqReceived(virq) - else: - self.msgReceived(port) + self.msgReceived(port) else: select.select([self.notifier], [], [], 1.0) @@ -218,15 +202,6 @@ class ChannelFactory: thread.setDaemon(True) thread.start() - def setVirqHandler(self, virqHandler): - self.virqHandler = virqHandler - - def virqReceived(self, virq): - if DEBUG: - print 'virqReceived>', virq - if not self.virqHandler: return - self.runInThread(lambda virq=virq: self.virqHandler(virq)) - def newChannel(self, dom, local_port, remote_port): """Create a new channel. """ @@ -547,9 +522,6 @@ class Channel: printMsg(msg) self.queue.response(getMessageId(msg), msg) - def virq(self): - self.factory.virq() - class Response: """Entry in the response queue. Used to signal a response to a message. -- 2.30.2